@dxos/react-ui-editor 0.6.12-staging.e11e696 → 0.6.13-main.041e8aa

package/dist/lib/browser/{chunk-AZWYO7TE.mjs → chunk-CIQSMP7K.mjs}

@@ -80,7 +80,7 @@ var localStorageStateStoreAdapter = {
     localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state2));
   }
 };
-var createEditorStateTransaction = ({ scrollTo, selection }) => {
+var createEditorStateTransaction = (state2, { scrollTo, selection }) => {
   return {
     selection,
     scrollIntoView: !scrollTo,
@@ -128,7 +128,7 @@ var state = ({ getState, setState } = {}) => {
         run: (view) => {
           const state2 = getState(view.state.facet(documentId));
           if (state2) {
-            view.dispatch(createEditorStateTransaction(state2));
+            view.dispatch(createEditorStateTransaction(view.state, state2));
           }
           return true;
         }
@@ -145,4 +145,4 @@ export {
   createEditorStateTransaction,
   state
 };
-//# sourceMappingURL=chunk-AZWYO7TE.mjs.map
+//# sourceMappingURL=chunk-CIQSMP7K.mjs.map

package/dist/lib/browser/{chunk-AZWYO7TE.mjs.map → chunk-CIQSMP7K.mjs.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/state/util.ts", "../../../src/state/cursor.ts", "../../../src/state/doc.ts", "../../../src/state/state.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Facet } from '@codemirror/state';\n\nexport const singleValueFacet = <I, O = I>(defaultValue?: O) =>\n  Facet.define<I, O>({\n    // Called immediately.\n    combine: (providers) => {\n      return (providers[0] ?? defaultValue) as O;\n    },\n  });\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState } from '@codemirror/state';\n\nimport { type Range } from './types';\nimport { singleValueFacet } from './util';\n\n/**\n * Converts indexes into the text document into stable peer-independent cursors.\n *\n * See:\n *  - https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html\n *  - https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions\n *\n * @param {assoc} number Negative values will associate the cursor with the previous character\n *  while positive - with the next one.\n */\nexport interface CursorConverter {\n  toCursor(position: number, assoc?: -1 | 1 | undefined): string;\n  fromCursor(cursor: string): number;\n}\n\nconst defaultCursorConverter: CursorConverter = {\n  toCursor: (position) => position.toString(),\n  fromCursor: (cursor) => parseInt(cursor),\n};\n\nexport class Cursor {\n  static readonly converter = singleValueFacet(defaultCursorConverter);\n\n  static readonly getCursorFromRange = (state: EditorState, range: Range) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const from = cursorConverter.toCursor(range.from);\n    const to = cursorConverter.toCursor(range.to, -1);\n    return [from, to].join(':');\n  };\n\n  static readonly getRangeFromCursor = (state: EditorState, cursor: string) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const parts = cursor.split(':');\n    const from = cursorConverter.fromCursor(parts[0]);\n    const to = cursorConverter.fromCursor(parts[1]);\n    return from !== undefined && to !== undefined ? { from, to } : undefined;\n  };\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { singleValueFacet } from './util';\n\n/**\n * Currently edited document id as FQ string.\n */\nexport const documentId = singleValueFacet<string>();\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Extension, Transaction, type TransactionSpec } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\n\nimport { debounce } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { isNotFalsy } from '@dxos/util';\n\nimport { documentId } from './doc';\n\nconst stateRestoreAnnotation = 'dxos.org/cm/state-restore';\n\nexport type EditorSelection = {\n  anchor: number;\n  head?: number;\n};\n\nexport type EditorSelectionState = {\n  scrollTo?: number;\n  selection?: EditorSelection;\n};\n\nexport type EditorStateOptions = {\n  setState: (id: string, state: EditorSelectionState) => void;\n  getState: (id: string) => EditorSelectionState | undefined;\n};\n\nconst keyPrefix = 'dxos.org/react-ui-editor/state';\nexport const localStorageStateStoreAdapter: EditorStateOptions = {\n  getState: (id) => {\n    invariant(id);\n    const state = localStorage.getItem(`${keyPrefix}/${id}`);\n    return state ? JSON.parse(state) : undefined;\n  },\n\n  setState: (id, state) => {\n    invariant(id);\n    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));\n  },\n};\n\nexport const createEditorStateTransaction = ({ scrollTo, selection }: EditorSelectionState): TransactionSpec => {\n  return {\n    selection,\n    scrollIntoView: !scrollTo,\n    effects: scrollTo ? EditorView.scrollIntoView(scrollTo, { yMargin: 96 }) : undefined,\n    annotations: Transaction.userEvent.of(stateRestoreAnnotation),\n  };\n};\n\n/**\n * Track scrolling and selection state to be restored when switching to document.\n */\n// TODO(burdon): Rename.\nexport const state = ({ getState, setState }: Partial<EditorStateOptions> = {}): Extension => {\n  const setStateDebounced = debounce(setState!, 1_000);\n\n  return [\n    // TODO(burdon): Track scrolling (currently only updates when cursor moves).\n    // EditorView.domEventHandlers({\n    //   scroll: (event) => {\n    //     setStateDebounced(id, {});\n    //   },\n    // }),\n    EditorView.updateListener.of(({ view, transactions }) => {\n      const id = view.state.facet(documentId);\n      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {\n        return;\n      }\n\n      if (setState) {\n        const { scrollTop } = view.scrollDOM;\n        const pos = view.posAtCoords({ x: 0, y: scrollTop });\n        if (pos !== null) {\n          const { anchor, head } = view.state.selection.main;\n          setStateDebounced(id, { scrollTo: pos, selection: { anchor, head } });\n        }\n      }\n    }),\n    getState &&\n      keymap.of([\n        {\n          key: 'ctrl-r', // TODO(burdon): Setting to jump back to selection.\n          run: (view) => {\n            const state = getState(view.state.facet(documentId));\n            if (state) {\n              view.dispatch(createEditorStateTransaction(state));\n            }\n            return true;\n          },\n        },\n      ]),\n  ].filter(isNotFalsy);\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Facet } from '@codemirror/state';\n\nexport const singleValueFacet = <I, O = I>(defaultValue?: O) =>\n  Facet.define<I, O>({\n    // Called immediately.\n    combine: (providers) => {\n      return (providers[0] ?? defaultValue) as O;\n    },\n  });\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState } from '@codemirror/state';\n\nimport { type Range } from './types';\nimport { singleValueFacet } from './util';\n\n/**\n * Converts indexes into the text document into stable peer-independent cursors.\n *\n * See:\n *  - https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html\n *  - https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions\n *\n * @param {assoc} number Negative values will associate the cursor with the previous character\n *  while positive - with the next one.\n */\nexport interface CursorConverter {\n  toCursor(position: number, assoc?: -1 | 1 | undefined): string;\n  fromCursor(cursor: string): number;\n}\n\nconst defaultCursorConverter: CursorConverter = {\n  toCursor: (position) => position.toString(),\n  fromCursor: (cursor) => parseInt(cursor),\n};\n\nexport class Cursor {\n  static readonly converter = singleValueFacet(defaultCursorConverter);\n\n  static readonly getCursorFromRange = (state: EditorState, range: Range) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const from = cursorConverter.toCursor(range.from);\n    const to = cursorConverter.toCursor(range.to, -1);\n    return [from, to].join(':');\n  };\n\n  static readonly getRangeFromCursor = (state: EditorState, cursor: string) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const parts = cursor.split(':');\n    const from = cursorConverter.fromCursor(parts[0]);\n    const to = cursorConverter.fromCursor(parts[1]);\n    return from !== undefined && to !== undefined ? { from, to } : undefined;\n  };\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { singleValueFacet } from './util';\n\n/**\n * Currently edited document id as FQ string.\n */\nexport const documentId = singleValueFacet<string>();\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState, type Extension, Transaction, type TransactionSpec } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\n\nimport { debounce } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { isNotFalsy } from '@dxos/util';\n\nimport { documentId } from './doc';\n\nconst stateRestoreAnnotation = 'dxos.org/cm/state-restore';\n\nexport type EditorSelection = {\n  anchor: number;\n  head?: number;\n};\n\nexport type EditorSelectionState = {\n  scrollTo?: number;\n  selection?: EditorSelection;\n};\n\nexport type EditorStateOptions = {\n  setState: (id: string, state: EditorSelectionState) => void;\n  getState: (id: string) => EditorSelectionState | undefined;\n};\n\nconst keyPrefix = 'dxos.org/react-ui-editor/state';\nexport const localStorageStateStoreAdapter: EditorStateOptions = {\n  getState: (id) => {\n    invariant(id);\n    const state = localStorage.getItem(`${keyPrefix}/${id}`);\n    return state ? JSON.parse(state) : undefined;\n  },\n\n  setState: (id, state) => {\n    invariant(id);\n    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));\n  },\n};\n\nexport const createEditorStateTransaction = (\n  state: EditorState,\n  { scrollTo, selection }: EditorSelectionState,\n): TransactionSpec => {\n  return {\n    selection,\n    scrollIntoView: !scrollTo,\n    effects: scrollTo ? EditorView.scrollIntoView(scrollTo, { yMargin: 96 }) : undefined,\n    annotations: Transaction.userEvent.of(stateRestoreAnnotation),\n  };\n};\n\n/**\n * Track scrolling and selection state to be restored when switching to document.\n */\n// TODO(burdon): Rename.\nexport const state = ({ getState, setState }: Partial<EditorStateOptions> = {}): Extension => {\n  const setStateDebounced = debounce(setState!, 1_000);\n\n  return [\n    // TODO(burdon): Track scrolling (currently only updates when cursor moves).\n    // EditorView.domEventHandlers({\n    //   scroll: (event) => {\n    //     setStateDebounced(id, {});\n    //   },\n    // }),\n    EditorView.updateListener.of(({ view, transactions }) => {\n      const id = view.state.facet(documentId);\n      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {\n        return;\n      }\n\n      if (setState) {\n        const { scrollTop } = view.scrollDOM;\n        const pos = view.posAtCoords({ x: 0, y: scrollTop });\n        if (pos !== null) {\n          const { anchor, head } = view.state.selection.main;\n          setStateDebounced(id, { scrollTo: pos, selection: { anchor, head } });\n        }\n      }\n    }),\n    getState &&\n      keymap.of([\n        {\n          key: 'ctrl-r', // TODO(burdon): Setting to jump back to selection.\n          run: (view) => {\n            const state = getState(view.state.facet(documentId));\n            if (state) {\n              view.dispatch(createEditorStateTransaction(view.state, state));\n            }\n            return true;\n          },\n        },\n      ]),\n  ].filter(isNotFalsy);\n};\n"],
+  "mappings": "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",
   "names": ["Facet", "singleValueFacet", "defaultValue", "Facet", "define", "combine", "providers", "defaultCursorConverter", "toCursor", "position", "toString", "fromCursor", "cursor", "parseInt", "Cursor", "converter", "singleValueFacet", "getCursorFromRange", "state", "range", "cursorConverter", "facet", "from", "to", "join", "getRangeFromCursor", "parts", "split", "undefined", "documentId", "singleValueFacet", "Transaction", "EditorView", "keymap", "debounce", "invariant", "isNotFalsy", "stateRestoreAnnotation", "keyPrefix", "localStorageStateStoreAdapter", "getState", "id", "invariant", "state", "localStorage", "getItem", "JSON", "parse", "undefined", "setState", "setItem", "stringify", "createEditorStateTransaction", "scrollTo", "selection", "scrollIntoView", "effects", "EditorView", "yMargin", "annotations", "Transaction", "userEvent", "of", "setStateDebounced", "debounce", "updateListener", "view", "transactions", "facet", "documentId", "some", "tr", "isUserEvent", "scrollTop", "scrollDOM", "pos", "posAtCoords", "x", "y", "anchor", "head", "main", "keymap", "key", "run", "dispatch", "filter", "isNotFalsy"]
 }

package/dist/lib/browser/index.mjs

@@ -5,7 +5,7 @@ import {
   localStorageStateStoreAdapter,
   singleValueFacet,
   state
-} from "./chunk-AZWYO7TE.mjs";
+} from "./chunk-CIQSMP7K.mjs";
 
 // packages/ui/react-ui-editor/src/translations.ts
 var translationKey = "react-ui-editor";
@@ -1237,6 +1237,51 @@ var clientRectsFor = (dom) => {
   }
 };
 
+// packages/ui/react-ui-editor/src/extensions/util/error.ts
+import { log as log3 } from "@dxos/log";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util/error.ts";
+var wrapWithCatch = (fn) => {
+  return (...args) => {
+    try {
+      return fn(...args);
+    } catch (err) {
+      log3.catch(err, void 0, {
+        F: __dxlog_file5,
+        L: 12,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+  };
+};
+
+// packages/ui/react-ui-editor/src/extensions/util/overlap.ts
+var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
+
+// packages/ui/react-ui-editor/src/extensions/util/react.tsx
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { ThemeProvider } from "@dxos/react-ui";
+import { defaultTx } from "@dxos/react-ui-theme";
+var createElement = (tag, options, children) => {
+  const el = document.createElement(tag);
+  if (options?.className) {
+    el.className = options.className;
+  }
+  if (children) {
+    el.append(...Array.isArray(children) ? children : [
+      children
+    ]);
+  }
+  return el;
+};
+var renderRoot = (root, node) => {
+  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
+    tx: defaultTx
+  }, node));
+  return root;
+};
+
 // packages/ui/react-ui-editor/src/extensions/command/hint.ts
 var CommandHint = class extends WidgetType2 {
   constructor(content) {
@@ -1327,51 +1372,6 @@ import { debounce } from "@dxos/async";
 import { log as log5 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/extensions/util/error.ts
-import { log as log3 } from "@dxos/log";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util/error.ts";
-var wrapWithCatch = (fn) => {
-  return (...args) => {
-    try {
-      return fn(...args);
-    } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file5,
-        L: 12,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
-  };
-};
-
-// packages/ui/react-ui-editor/src/extensions/util/overlap.ts
-var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
-
-// packages/ui/react-ui-editor/src/extensions/util/react.tsx
-import React from "react";
-import { createRoot } from "react-dom/client";
-import { ThemeProvider } from "@dxos/react-ui";
-import { defaultTx } from "@dxos/react-ui-theme";
-var createElement = (tag, options, children) => {
-  const el = document.createElement(tag);
-  if (options?.className) {
-    el.className = options.className;
-  }
-  if (children) {
-    el.append(...Array.isArray(children) ? children : [
-      children
-    ]);
-  }
-  return el;
-};
-var renderRoot = (root, node) => {
-  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
-    tx: defaultTx
-  }, node));
-  return root;
-};
-
 // packages/ui/react-ui-editor/src/util.ts
 import { log as log4 } from "@dxos/log";
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
@@ -1381,12 +1381,16 @@ var callbackWrapper = (fn) => (...args) => {
   } catch (err) {
     log4.catch(err, void 0, {
       F: __dxlog_file6,
-      L: 18,
+      L: 19,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
 };
+var debugDispatcher = (trs, view) => {
+  logChanges(trs);
+  view.update(trs);
+};
 var logChanges = (trs) => {
   const changes = trs.flatMap((tr) => {
     if (tr.changes.empty) {
@@ -1407,7 +1411,7 @@ var logChanges = (trs) => {
       changes
     }, {
       F: __dxlog_file6,
-      L: 39,
+      L: 49,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1799,8 +1803,11 @@ var scrollThreadIntoView = (view, id, center = true) => {
   }
 };
 var selectionOverlapsComment = (state2) => {
+  const commentState = state2.field(commentsState, false);
+  if (commentState === void 0) {
+    return false;
+  }
   const { selection } = state2;
-  const commentState = state2.field(commentsState);
   for (const range of selection.ranges) {
     if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {
       return true;
@@ -5232,7 +5239,6 @@ var instanceCount = 0;
 var useTextEditor = (props = {}, deps = []) => {
   const { id, initialValue, extensions, autoFocus, scrollTo, selection, moveToEndOfLine, debug } = useMemo3(() => getProviderValue(props), deps ?? []);
   const [instanceId] = useState4(() => `text-editor-${++instanceCount}`);
-  const onUpdate = useRef2();
   const [view, setView] = useState4();
   const parentRef = useRef2(null);
   useEffect3(() => {
@@ -5244,7 +5250,7 @@ var useTextEditor = (props = {}, deps = []) => {
         doc: initialValue?.length ?? 0
       }, {
         F: __dxlog_file11,
-        L: 78,
+        L: 76,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -5265,42 +5271,35 @@ var useTextEditor = (props = {}, deps = []) => {
         selection: initialSelection,
         extensions: [
           id && documentId.of(id),
-          // NOTE: Doesn't catch errors in keymap functions.
+          extensions,
+          // NOTE: This doesn't catch errors in keymap functions.
           EditorView18.exceptionSink.of((err) => {
             log8.catch(err, void 0, {
               F: __dxlog_file11,
-              L: 100,
+              L: 98,
               S: void 0,
               C: (f, a) => f(...a)
             });
-          }),
-          extensions,
-          EditorView18.updateListener.of(() => {
-            setTimeout(() => {
-              onUpdate.current?.();
-            });
           })
         ].filter(isNotFalsy3)
       });
       view2 = new EditorView18({
         parent: parentRef.current,
         state: state2,
-        // NOTE: Uncomment to debug/monitor all transactions.
-        // https://codemirror.net/docs/ref/#view.EditorView.dispatch
-        dispatchTransactions: (trs, view3) => {
-          if (debug) {
-            logChanges(trs);
-          }
-          view3.update(trs);
-        }
+        scrollTo: scrollTo ? EditorView18.scrollIntoView(scrollTo, {
+          yMargin: 96
+        }) : void 0,
+        dispatchTransactions: debug ? debugDispatcher : void 0
       });
-      if (!initialValue && moveToEndOfLine) {
+      if (moveToEndOfLine && !initialSelection) {
         const { to } = view2.state.doc.lineAt(0);
-        view2.dispatch({
-          selection: {
-            anchor: to
-          }
-        });
+        if (to) {
+          view2.dispatch({
+            selection: {
+              anchor: to
+            }
+          });
+        }
       }
       setView(view2);
     }
@@ -5318,21 +5317,20 @@ var useTextEditor = (props = {}, deps = []) => {
   }, deps);
   useEffect3(() => {
     if (view) {
-      onUpdate.current = () => {
-        onUpdate.current = void 0;
-        view.dispatch(createEditorStateTransaction({
+      if (view.state.facet(editorInputMode).noTabster) {
+        parentRef.current?.removeAttribute("data-tabster");
+      }
+      if (scrollTo || selection) {
+        view.dispatch(createEditorStateTransaction(view.state, {
           scrollTo,
           selection
         }));
-      };
-      if (view.state.facet(editorInputMode).noTabster) {
-        parentRef.current?.removeAttribute("data-tabster");
       }
     }
   }, [
     view,
-    selection,
-    scrollTo
+    scrollTo,
+    selection
   ]);
   useEffect3(() => {
     if (view && autoFocus) {
@@ -5403,6 +5401,7 @@ export {
   createExternalCommentSync,
   createMarkdownExtensions,
   createThemeExtensions,
+  debugDispatcher,
   debugNodeLogger,
   debugTree,
   decorateMarkdown,